Support dots and slashes in virtual custom attributes #14329
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lpichler
changed the title
|
@miq-bot remove_label euwe/yes (it needs special PR for euwe) |
|
@lpichler Cannot remove the following label because they are not recognized: euwe/yes (it needs special pr for euwe) |
special characters in custom attributes
Field with virtual custom attributes don’t contains associations so it don’t contain “.” as separator it has always form: <Model>-virtual_custom_attribute_<name_of_attribute> After this we need to escape it back because there was dynamic method created with unescaped form, and such method will be called in evaluation.
before:
ns= ‘/virtual/parent_resource_pool/name’
predicate = ns.split("/")
=> ["", "virtual", "parent_resource_pool", "name"]
predicate = ns.split(“/“)[2..-1] # throw away /virtual
=> ["parent_resource_pool", "name"]
after: (same)
ns= ‘/virtual/parent_resource_pool/name’
ns.gsub!("/virtual/","") # throw away /virtual
=> ‘parent_resource_pool/name’
predicate = ns.split("/")
=> ["parent_resource_pool", "name"]
lpichler
changed the title
|
euwe pr #14363 |
…acters now there is allowed to have special characters as `-` and `.` `/`
lpichler
changed the title
|
Checked commits lpichler/manageiq@9e09e03~...faaecaf with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0 app/models/tag.rb
lib/miq_expression.rb
|
gtanzillo
approved these changes
Mar 16, 2017
| ns.gsub!('/virtual/','') # throw away /virtual | ||
| ns, virtual_custom_attribute = MiqExpression.escape_virtual_custom_attribute(ns) | ||
| predicate = ns.split("/") | ||
| predicate.map!{ |x| URI::RFC2396_Parser.new.unescape(x) } if virtual_custom_attribute |
There was a problem hiding this comment.
Just a suggestion, perhaps you can create an unescape_virtual_custom_attribute too. Can be done in a followup PR.
|
Backported to Euwe via #14363 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
temporarily replacing #11112
fixes #10482 point 1
Using
URI::RFC2396_Parserfrom #13713 - thanks! @gtanzillo @cben @zeari@miq-bot add_label euwe/yes, bug, reporting
cc @simon3z
please review @cben @zeari
@miq-bot assign @gtanzillo
I have explanation in commit messages.
tested:
Links [Optional]
Scenarios:
Case1
Generate report and see results
Case2
create expression with using custom attributes
Generate report and see results
Case3
as Case2 but remove custom attribute from selected field and leave it in expression
Generate report and see results
How to add custom attributes